Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change size type in AnnotateBenignRaceSized to size_t from long #706

Merged
merged 1 commit into from
Sep 3, 2021

Conversation

dfreese
Copy link
Contributor

@dfreese dfreese commented Sep 3, 2021

This makes this definition consistent with Abseil's declarations. See:
https://github.com/abseil/abseil-cpp/blob/master/absl/base/dynamic_annotations.h#L213-L215

Having this unsigned seems to match what libsanitizers is expecting:
https://github.com/gcc-mirror/gcc/blob/16e2427f50c208dfe07d07f18009969502c25dc8/libsanitizer/tsan/tsan_interface_ann.cpp#L367-L371

This solves a "conflicting declaration of C function" when using glog
with abseil.

This makes this definition consistent with Abseil's declarations.  See:
https://github.com/abseil/abseil-cpp/blob/master/absl/base/dynamic_annotations.h#L213-L215

Having this unsigned seems to match what libsanitizers is expecting:
https://github.com/gcc-mirror/gcc/blob/16e2427f50c208dfe07d07f18009969502c25dc8/libsanitizer/tsan/tsan_interface_ann.cpp#L367-L371

This solves a "conflicting declaration of C function" when using glog
with abseil.
@sergiud
Copy link
Collaborator

sergiud commented Sep 3, 2021

Thanks!

@sergiud sergiud merged commit 9733727 into google:master Sep 3, 2021
@dfreese dfreese deleted the tsan_annotation branch September 3, 2021 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants